From 56f7d5db127824d6846d0ae89f869f5c59bc7893 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 15 Dec 2015 14:14:00 +0100 Subject: [PATCH] build: convert HAS_VGA use to Kconfig Use the Kconfig generated CONFIG_HAS_VGA defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 2 +- xen/arch/x86/Rules.mk | 1 - xen/drivers/video/Kconfig | 5 +++++ xen/drivers/video/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index ee8df87a20..a42c149c5f 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -8,7 +8,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI - select HAS_VIDEO + select HAS_VGA config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 2ba10ceeb0..592d1f2f25 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_VGA := y HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 7fc7aeabea..2b553d9869 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -2,3 +2,8 @@ # Select HAS_VIDEO if video is supported config HAS_VIDEO bool + +# Select HAS_VGA if VGA is supported +config HAS_VGA + bool + select HAS_VIDEO diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index 914b6cfb7c..0143c4a6fd 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ -obj-$(HAS_VGA) := vga.o +obj-$(CONFIG_HAS_VGA) := vga.o obj-$(CONFIG_HAS_VIDEO) += font_8x14.o obj-$(CONFIG_HAS_VIDEO) += font_8x16.o obj-$(CONFIG_HAS_VIDEO) += font_8x8.o obj-$(CONFIG_HAS_VIDEO) += lfb.o -obj-$(HAS_VGA) += vesa.o +obj-$(CONFIG_HAS_VGA) += vesa.o obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o -- 2.30.2